Avoid unnecessary return statements
